Removed clientId and clientSecret from several constructors