Hb: removed unused code
Avoiding deprecated method