Clean up configuration classes