Removed the superfluous validity check facility