last bits of cleanup