More trashing of redundant code