BBB-102: Cleaned code after fix commit