Separate collect metrics from queue prep

:warning: this branch is for reference only and will not be merged :warning: