Remove unused deps. Refact.