Delete unused helpers and tests for same.