Cleanup, Use picocontainer start events to wire things up