More cleanup to requirements.