#235 cleanup