Did a bit more cleanup. Can't seem to get rid of OAuth stuff correctly.. I don't think I'm using it.. s'cool, though. Maybe I will later.