Eliminate minor stuff