BRID-211 BRID-212 Cleanup