Removed unnecessary and cyclic dependence