Removed dispatch (buggy)
Get rid of dispatch files