Some final cleanups, removing unneeded files & speeding tests.