Removed unused code (PIRATE-2232)