Remove deis scheduler...
Add workarounds for issues