Update README's, remove some unused code