#1045020 by Les Lim: Changed Remove obsolete nodereference and userreference module...