Cleanup definitions and requirements.