Remove unneeded function argument
Merge remote-tracking branch 'Hammermaster/master' into playground