1st pass of auto trips eliminated/diverted

Still getting fishy results, though...