Remove unused dependencies and reformat
reindent again