Removed unused packages and files