Removed a couple of deprecated methods