Eliminate some inventory code