Remove comments left over the place