BBB-103: Cleaned up code before final test