Remove old invalid logic