Clients and entities are now cleaned up nicely.