User context

cleanup of #57