Clean-up client requirements and cmdmanager