More redundancy removed