Remove some outdated code

Closes #38