Removed commented code, and fix charset duplication