Cleaned up configuration