Remove unused dependencies
Make better use of lenses