Remove a bunch of things that we don't specifically need
Make some fixes