Clean up requirements

Change-Id: I6e70f5a54d73689732cbfe5e0b4703f33803f4b7