lift quartz for now. cleanups as well