Cleanup some imports and document #createId in UniqueId