Remove weird helpers