Remove framework elements to framework and clean up requirements.