Blind update to 4.4
Cleanup the mess