removed extra stuff from user