remove all deps
remove view, minor tidy ups