general attribute work; cleanup