More removal of ww3 files and some other general cleanup.