Remove obsolete and commented code.