Remove commented dead code