Update for new version of platform, code cleanup