Remove depency on ext-session