Refactor Exec stuff
Remove scratch file.