cleanup obsolete code paths