Minor improvements
Remove unused parameters