Merge "cleanup some of the STOPSHIP comments"