Remove old logic