removed more redundancies