Add support for CD-k training
Fix the default trainer to CD-1
Remove unecessary code