cleanups mostly in users section
cleanups mostly in users section