Remove unnecessary helpers
Fixed conflicts due to merge from upstream
Merge pull request #3 from Xeno-Genesis/master

Remove unnecessary helpers