add validate button and remove a bunch of unused stuff