fix errors in order to pass tests
remove unused dependancies