Removed more unused packages