Updated/Deleted unneeded stuff.