More cleanup. Finally okay with it.