Removed bits of platform specific code