Eliminate superfluous code