Resolved redundancy warnings