Commenting and removing unused code