various cleanup, now reads from json