Cleanup obsolete code.