remove old logic