refactoring. private[this], delete deprecated values