DDBEXTRA-172: commented code removed