Remove unused deps
Coding style