Remove unnecessary code from EditProfile and edit_profile.xml