cleanup based on usage tests with platform client