Removing some defers.