Lose some innecesary dependencies in classes