add return to squash warning
squash warning again
removed helpers