Yeah, there are other places to clean up, but the my original intention was to fix the ordering that was causing failures every now and then https://bugzilla.redhat.com/show_bug.cgi?id=1016468. Therefore I would like to fix that first