Cleanup unused strings and definitions