Purged reliability, cleaned up queries and tests