Finish removing unnecessary -v option