Fixed up problems in the previous commit with remove.py
Fixed up problems in the previous commit with remove.py

cglewis/vcontrol,cglewis/vcontrol,CyberReboot/vcontrol,cglewis/vcontrol,CyberReboot/vcontrol,CyberReboot/vcontrol