remove cruft and improve pod as per #134