entity close made saner