Removing depenancies