Removed useless validation check