Removes dependancy on another class

Removes dependency and adds a var for user agent