Lots of changes. Removed many deps