Some clean up to 3.4.8 commit