Cleaning up to slim down dependencies. Issue #14