Cleaned up entity settings.