Staff panel cleanup