Removing all of the empty helpers because they are useless but clutter everything