Cleanup, remove unused code/method.

This PR resolves some todos, that had were delayed until another branch was merged. Closes #342.