Remove deprecated functions

In preparation for result discussed in #34