Removed InstanceMapping namedtuple
Cleanup and docs