Tidy up

Remove some debug comments
Made a change the Vadim had made in master : DE73486
Deleted duplicate templates from the eclipse pluigin
28 files changed