more cleanup
Merge pull request #2 from RonnieHegelund/master

more cleanup