Clean-up some unused modes