Cleanup unused files
SETTINGS ISSUE...