BRID-219 : Cleanup