remove conditional logic from configuration classes