attempt to fix cleanup