some cleanup of initial config procedure