starting cleanup of 0.6