Remove promises from Shepherd internals