3.4.3 cleanup