Remove all singleton tests and code.