consolidate attributes; remove policy