Remove a illegal char and remove solved todo comments