Removed singleUnit option from comms setup