Clean up paths and submission path