W00t :D More cleanup