Merge pull request #5528 from krisselden/platform-cleanup

Cleanup platform
Change ENV.MANDATORY_SETTER to FEATURES so it can be compiled out of production builds.