[BEP-1182] Housekeeping