Remove cruft from intent service