#288 cleanup