Cleanup of recently added attributes.

Cl