Clean-up in README and removing TODO files.