Cleanup obsolete changes