Remove buf bits which moved to mLib. Fix email addresses.