remove cruft to reduce warnings