avoided container injection, removed user integration