Removing unnecessary helpers