[All] Cleaner platform code