Removed commented code and remaining forced exception