Sandbox/free cleanup, removed future-promises