#6 cleanup