Clean up code

1 job for !1610 with 6347-notifications-to-reseller-not-working in 7 minutes and 27 seconds (queued for 2 minutes and 41 seconds)
merge request