Removing a couple more unused packages