Removes retry because it doesn't make sense as per @mr-archano suggestion
Removes unused class
Removes unused classes
Merge pull request #190 from novoda/address_some_comments_from_pull_173

Address some comments from pull 173