Replaced json with yaml, removed TODO file, removed old stuff