removing warning during tests
removing dead code