Cleanup for WP.org Repo review