removed quad, cleanups