Cleanup, removed container injection from loader