Updated to latest value-mapper
Removing stale TODO's