Merge pull request #789 from thomas33/master

cleanup part 3