DS-1975 Remove another couple of Bootstrap 'container's