Simplify resolving continuous deployment

Minor tweaks, just deleting some dead code and removing a tuple where we could just have two parameters.