Add new platforms, and cleanup.