Starting to cleanup the AppVeyor helper