Comment cleanup from previous commit