Clean up some files, update dependencies