Clean up attribute usage