Requirement and Command Registry cleanup