add nodetype + nodemapper cleanup fix