Some cleanup for 4.1