Big cleanup of attributes.