Clean up SpecialGadgets to stop fatals and deprecation warnings

Change-Id: Ieca843564a7f8b3bb86b6a978a88379f66f77b04