remove unused dependency and completed TODO comment