small cleanups - removing un-needed containers