clean up
Merge pull request #6 from mk01/2ab600af2fab49e3f88ba878516f54e423c6e9e3

clean ups before hanoi