Removed old cruft, updated dependencies