Remove respond_to?

* Appears that existing functionality doesn't work as expected with this