Remove dependency on employee table