Removed unnecessary use of intents