Remove unused defers.

Also, we no longer return defers for those actions.
Work in progress...