Also took the opportunity to clean up some old files.