Cleaned up dependencies a bit
XHR seems faster on the Rpi