E1S7: removed some unnecessary unit stores