More simplification (Thanks Dv - it was your idea all along)
Cleanup.