Removed some redundant code.
Updated the helperdata.

Signed-off-by: Oskar <oskar.warme@gmail.com>