Removed commented try/catch blocks