DDBNEXT-1735: Removed extra code