Cleanup to bring things back closer to master
More cleanup
Move AppFn to Prelude