Very small cleanup for platform and plugin