sunday simplification

there are few things more satisfying that removing lots of code that
isn't needed any longer!