Remove commented code

There is a to-do from 2012. Let's not have this kinda rubbish still there