Remove seperate validator code