#13 cleanup