Dependency removements and freezing bug fix