Revert "Fix Container usage in database tables"

This reverts commit 2cc427514a7fa5018bfbae434c7f561c92c1a6e5.
No containers for db tables