listContainerRaw and some general cleanup