[BF] Removing unnecessary code