Hopefully this will fix the cleanup