Updated a few packages and references, cleaning up junk