clean up and remove session support