Cleanup: remove obsolete strings