More cleanup

Atrared work an ASM to remove the boat item, not going very well, don't
know why
Work