remove preamble
remove unused stuff
fix some comments
Merge pull request #182 from osa1/cleanup

cleanup