Partial implementation of #462

let's remove that it should be created, if it is not used currently, don't keep it in the class