Clean up staff view code