Remove unnecessary mappings and add insert command