Remove now-obsolete code