Remove helpers. Closes #1466