PIM-3319: Fixed some typos in the use of exceptions
PIM-3319: removed unused methods