Removed map comments as well