Remove obsolete commented code