Switch made, cleanup started, tests are passing