Tidied up staging world interaction code