Remove unused dependencies Bug #8