cleap up redundancy