Clean up more units