Clean up 4.4.1 merge