Revert "Revert "ROMControl: Clean-up && RemovePrefs""

This reverts commit 3e470c7dde8644cc08eaa6744bab6466f353027a.