Tools - Quix

Cleanup after merge.