Code simplification
Remove unused `object` arguments