Cleanup obsolete functionality.