I am skipping this in favor of doing more cleanups at a later point. (There are many many references to files, directories, etc. throughout the codebase).