Removed duplication from Memory::Query