Improvements in 006 to 008 mappings, cleanup