Major cleanup. Removed some packages we may never use, along with other clean up.