Cleanup dead code

This shouldn't have made it into the initial commit.