DAR-2604: cleaning up the blackout code in modal component