Revert "Add other containers"

This reverts commit c1622a6f16f13867a42935c16f65374ac137c5e5.