Removed email and name field and added username