Remove unused helpers