Eliminate some redundancies