remove and fix confusing comments