Remove some Future handler, fix race conditions