Commenting and removing unused variables