Boot comment clean up