Removed dead code in attribute expander

Change-Id: I8ca449938d1c05fbe74cf29e2551891cfba5b38d
Merge "Removed dead code in attribute expander"