clean up static helpers