More file cleanup, and fixed stubs.