Removed ded code and fixed character list