5.4 cleanup