Clean some code

3 jobs for !76 with issue-3328JSON in 3 minutes and 57 seconds (queued for 4 seconds)
merge request