Cleanup 1: remove array manager