Removed obsolete packages, and resolved some minor errors