Valgrind: Remove unneeded separate FutureWatcher

Change-Id: I21fde2125a4a5d653fe4209e3452dec59c783d24
Reviewed-by: Eike Ziller <eike.ziller@digia.com>