Finalize all Marco and polo1/2 code