fixed user preference issues. Removed uneeded code
housekeeping