Clean Unit-tests, remove unused file.