More cleanup on obsolete files and typos