#16 #14 remove JSON stuff