REPACKAGE cleanup API for less arguments