Remove extra hedge-pig and misc cleanup