spec 80 cleanup