Fixed more redundancies.