Merge "clean up comments" into pi-dev