some redundancy fixes