Staff removal/refinement WIP