Major cleanup

We could, we'll talk about this (I hate CDNs :p)