0.60-cleanup