remove cruft take 2