And remove also the tests!