Remove no longer needed compatability code
Merge pull request #280 from dstufft/remove-compat-code

Remove no longer needed compatability code