Remove unnecessary exposed intents, Add toast handler