Removed some unused code and also the configuration class