Another culling of redundant code.