remove unnecc test
refactoring
refactoring