remove redundancy, more cleanup