Removes more hardcoded strings