Cleaning up platform specific init