Cleanup platform
Merge pull request #5528 from krisselden/platform-cleanup

Cleanup platform