Remove unused function parameters, cleaned signatures