Cleaning up Core mostly the toggles