remove stafftype subclasses
refactoring StaffType
update mtest