0.9 cleanup