Removed old Q2D code