Cleanup last commit. Remove local ncp, it shadows the parameter, add