controllers pre-split clean-up