updated to 4.3.4 7 part 2 cleanup