Removed some old and merge master into dev

Remove old loadHelper() that is not needed and merge master into dev branch.