Cleanup of unused parameters