Post-Deepavali cleanup

X