Fixed redundancies.