Merge "remove "// static" comments"