Moved settings to training
Deleted
Some cleanup