Remove code in comments
Fix requirements in Credentials