Remove platform specific