Removed user level stuff for now