cleanup and dsl provider interface changed