Cleanup for Staff functionality