Clean up code a bit

While trying to migrate stuff to a class I noticed some functions
that could be in utils.

Removed a join statement that shouldn't be there because we use
futures now.

Change-Id: Iab457a4b34ff176a6e39f1a02ba9b5377602e652