remove unambiguously merged content
cleanup more
Merge pull request #34 from mrterry/cleanup

Cleanup