docs, tests and removal of old references to Deferred