[BF] Removing left code
[BF] Fronted fixes for initial stage