cleanup sec 1-6

more cleanup