use units instead of groups for cleanup

this will make it easier to clean up wrecks/etc too