Revert "ROMControl: Clean-up && RemovePrefs"

This reverts commit 4b06dee32f956f864b25e1a60c632cd3d2107596.