More backend runner, some cleanup