Comparatively large update

Deleted a bunch of stuff. Removed unnecessary dependencies. Added a few
things as well.