FORGE-1155: Removed unnecessary code