fixed merge error + remove unnecessary method