Remove deprecated methods for gh-186 @wip