include cleanup
adapted to new attribute API