Init cleanup for 4.4