Removed commented out code and removed TODO in exception blocks