Remove code comments, later