remove staf-related commonds out