All tests compile and pass, I think I removed everything