Removing unused string
Misc code cleanup
Extraction of WOAS logic from Timer, refactoring for common-code prep
Pseudo3DRoundedRectangle cleanup