Some changes for next release
Clean up delays