Removing unnecessary dependence