cleaning up and fixed deleting user issue