Removed all unneccesary DLL references

The solution as a whole should be slightly less convoluted now.