removed unused parameters/variables