Move association reset to setup