Remove deprecated methods.

Things move pretty fast here on clyde.
Remove stray unused method.
Fix possible NPE-causer.