Removing old functions
Updating utils
Merge branch 'master' of github.com:cmaureir/nbi