Extra Character cleanup