undo new avoidance system because I didn't think how it was going to work, and it doesn't