Remove dependency on preferences product
Factor away successfully
Merge branch 'feature/remove_preferences' into develop