Get rid of unused helpers