Merge "Remove some unused methods in BSI"