Remove looseness of dependencies