COMP: Fix warnings in tubeCLIHelperFunctions and cleanup code