Cleans up creating the context
Updates to latest Arcavias core