Clean up of collector and training part II/II

Finished cleaning up: Training section completely transfered. Comments
added, obsolete variables removed.