Revert "QA 2"

This reverts commit f1a3aa9c9156d53586ef7024f70f2e03eb4aa30d.
Clean-up.
Clean-up.