Clean unused stuff + python formats json better