Removed unessesary code from settings