Commenting some unused code for the moment