Delete platform check in the core code base
Decouple from other bug fixes