Minor clean up, remove unused comments, etc.