Remove breaking stuff
Merge pull request #41 from f2prateek/revert-stuff

Revert commits that break the build.