removed smelly code and testFiles