Cleaned AppSandbox
More cleanup
And some more