Updated deps
Updated deps
Removing useless files
Code tidy