Removed extra responsibilities and default configuration.