Deploy: simplify codebase (dead-code removal, behavior-preserving)

1727091

Running