1343 Remove obsolete code