Remove comments: avoid duplocate call