cleanup Menu screens to share code from Setup.py, this can now be used to cleanup a lot of screens.