Remove helper references