Agreed changes

1- OrphanResource call method 
2- removed Location check for 202
3- and some refactoring