More cleanup and stuff