cleanup of settings...