removed some package tangles