better sneak integration, clean unused mappings