more code cleanup
Adding UCMBoundary as replacement for UCMEdge