Remove trampoline code and fix sandbox args