clean up unused code and fix or disable broken tests
Merge pull request #198 from Shopify/cleanup_code_and_tests

clean up unused code and fix or disable broken tests