Moved disassociation processing away from driver_*.c