More cleanup. Hope I didn't break anything.