removed unnecessary things
tests also ok