Remove 'core' from configuration classes