[#97] Clean up

* Remove unused or redundant code