1.30 cleanup, 1st of many probably