Stripped out things, to prepare for TDD.