removed redundunt codes in assessment and popup.