Revert "Add McDemo origin code"

This reverts commit 52a7d79ba4f145028f1d2466a87021eed336c71e.