removed unused arguments
 removed unused variable