Fix conditional quota display from config parameter
Remove TM
Clean-up
Remove TM