Bump version, remove module loaded twice and don't depend on bakerhelper
Merge with 3.0.1