cleanup platform support for 3.6.1