Remove 2d support and refactor