Commenting out code that needs to be refactored