Further cleanup of OASIS generated files.