Remove more swipe related stuff