Removing old statetree references, fixing problems for start/stop events
found during testing .