Removed Uni2D

This rolls back to commit 7c6f5b0e819d983e8b44cab10c12efc5a6b2429c.