Code cleaning

A bit of code cleaning: removed old commented parts, removed unnecessary conditionals
Merge branch 'master' of github.com:vischia/TopTaus