Commented out were parameters that didn't seem useful or were not used anymore, I've deleted them now.