Move CD stuff inside trainer
Clean
Cleanup