Cleanup: remove obsolete code.