Move cleanup back after finding issue that they were commented out for