Quix Updates & Cleanup