Remove click dependency