Cleanning up some old Godep nonsense

@meatballhat you were totally right

Going to merge this right away because some other stuff is depending on it, but please sanity check when you have a moment if you'd be so kind