remove junk & move left overs
less wat & tests pass
Merge branch 'feature/issue-9-less-wat-please' into develop