More cleanup n junk