Cleanup: no need for extra parameter