Ripping out the observer class as it is clunky and really doesn't get us much more than a simple hook

Making sure we can instantiate aggregators etc with null plan objects, plus a couple other minor fixes