UtBS 3: Remove unneeded location references

The unit in variable unit will always be at location x1,y1, so no need
to test for that. Similarly, since it's already there, there is no need
to specify its location on unstoring