Cleanup phase fixes

Much better at cleanup. Tanks rescue each other from being stuck.