Remove unnecessary intent fields