Merge pull request #6 from kellyredding/kr-remove-old

rewrite: remove deprecated stuff