fixed delayed job upgrade and cleaned up dependencies
merged