Remove deprecated methods and options. Fixes #425.