Clean up entities
Update Doc