Remove a lot of old fixes that we don't need anymore.