Clean up the gestures declarations, remove old method for determining if has modal