Remove unneeded vas code
Handle comments in a Godeps file
Clean up