Cleaning..Added 2D primitives