- in clearMapping, we put an empty map in there in case that type doesn't exist.
- changed log-related stuff