Remove more code
Update *.v.comp files