a big of cleaning before merge

7 jobs for !152 with clean/fetchingData in 6 minutes and 41 seconds (queued for 2 seconds)
latest merge request