Remove excess functions

Fixes #35 
First step to accomplishing #34