cleaned up package redefinitions, fixed several trickle-down-alots warnings