INT-3104: Remove reduntant code and format