Remove complexity.
Get the basic package stuff to work.