Remove redundant/outdated code

Fixes #5 and fixes #3