Remove variables and option to run agent in daemon mode