some cleanup - removed user settings, working on tests