Removed redundant files and refactored Roll Preferences