remove use of session.getContainer()