Remove extra boilerplate that's not being used

Fixes #2