Merge "Remove old code to try updates. This is now a separate program." into main