daemon related code removed