Removed more package references