Removed incorrect in_jail files and also contains merged files.