Remove unused strings, add -p not -u handling