package cruft removed