More cleanup. Added final mappings