Mobile: comments cleanup