Cleaned services

7 jobs for !162 with drop/redux in 6 minutes and 20 seconds (queued for 2 seconds)
latest merge request