Clean up deprecated methods/functions

Fixes #186.