Remove execution contexts
Clean up path handling code