remove old fallback code
Fix imports.
Merge pull request #264 from howbazaar/remove-old-debug-code

remove old fallback code

No longer needed.