Fixed pom merge
Fixed commands trying to unregister if non registered, #BFUN-5 fixed