Cleared mappings a bit