Cleaning up Veteran Forms