Chore/clean out cruft

Addresses #1