some clean up on 4.1