Spoilers: Remove additional hooks since this will be core