Remove all bits of old API from outside of try blocks

Thanks to Kris Thielemans for troubleshooting.  Closes #13.