Do some final cleanup, remove a bit of dead code and enjoy the now entirely trivial remaining code :-)