Remove obsolete codes