Commenting out cleanup for debugging purposes