0.5 cleanup