Remove dead/commented code
More code legibility improvements