Close #400 Remove old helper