Remove seperate validator code
Add redo code