Cleaned up package dependence. Spike. henrik