GOt rid of useless parameters