MYLOC-12 removed some comments