Fix #104 get rid of unused parameters