Commenting; removing old code