[PATCH 0/4] changes to slave configuration cleanup