cleanup intent processing

Change-Id: I01dffeb3d99ed220a0036de4b8c50f1a48ab0fe4