More cleanup & deleted unneeded files