Remove -s options and always associate

Needed since checkin code is reliant on setup having been run atm.