2.4 cleanup