BBB-102: Cleaned code after fixing commit