agent: Removing another portion of unneded code and includes.