Removing some junk and fixes ; mapping.