Changed up the build and removed unneeded dependencies