Move cleaning clean ups

Delete `charset.alias` directly if needed, and update a method comment.