Remove unused
Rename for less confusion
Fix text-keep-upright-align-viewport