Additional cleanup

Fixed non-manifold