BCCVL-124: Clean up session generate and background services