Add another optimization to remove no op operations