Remove ByValue references, use ByAttributes instead