Revert "Changes"

This reverts commit f68713f51a8376e8d13c1524051bd89965ff77b0.
Revert "Cleanup"

This reverts commit 18b92f4e804061e4ceb428dc4d10f707d92e477d.
Delayed Serving working