Cleanup swipe code

Change-Id: Ie3fc8a14e7810ee10764ec94ea281ac676572218