Remove old helpers