Removing a bunch of stuff to slim down the build