cleanup obsolete codes