Trim requirements down

Change-Id: Iaea3f18d9b40879b0b3339512e67a79ced944cd8