More cleanup. Pretty much working now.