Merge "Removing debbug comments" into main