configuration cleanup, closes #568