Drop obsolete code