Tidy up and removed createSession dummy call