Cleanup the way we get the id from factory Kind