Removed Old Credential Classes
Hot fix changes