Cleaned up the configuration