Remove autobackup file, minor cleanup