Removes some cruft and updates for a new OS