changed find and remove staffline functions