PRINCE: Code clean up after adding DrawNode