remove the old logic