removed state and role from directory and classes