removed remaining .data elements