Reworking Killer, to do away with the staging world