Debugging / commenting out the clean up lines