Trying to fix cleanup, somewhat there