Got rid of unused parameters