eagle: some cleanup

Change-Id: I15b0070bf8092ab756d3b3a72dcd821e3623efe2