Clean up requirements

Change-Id: If8cbfcea7be4629d02c48660aab2e0b8a041f1bf