removed extra monitoring components