clean up config using helpers