Delete a few unused mappings from works in progress, move other mappings to mappings section