Remove unused code and vtype