added unstack, removed unused mappings