correct some return values and remove some unused variables
1 file changed