CLeaned out all the crapt that doesn't work/wasn't being used.