clean up user section
more clean up user section