some cleanup for reconfiguration