Commenting and removing legacy code