cleanup part 4
Merge pull request #790 from thomas33/master

cleanup part 4