Cleaned up the settings file and depricated jockey