diff --git a/KernelModules.mk b/KernelModules.mk
index 76e3855..612a8c7 100644
--- a/KernelModules.mk
+++ b/KernelModules.mk
@@ -11,21 +11,6 @@ PRODUCT_COPY_FILES += \
     device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/drivers/hid/hid-dummy.ko:system/lib/modules/2.6.29.6-Kalim/kernel/drivers/hid/hid-dummy.ko \
     device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/drivers/net/wireless/tiwlan1251/wlan.ko:system/lib/modules/2.6.29.6-Kalim/kernel/drivers/net/wireless/tiwlan1251/wlan.ko \
     device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko:system/lib/modules/2.6.29.6-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipcomp6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipcomp6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/esp6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/esp6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/mip6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/mip6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipv6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipv6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/sit.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/sit.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/tunnel6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/tunnel6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ah6.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/ah6.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ip6_tunnel.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv6/ip6_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/ipv4/tunnel4.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/ipv4/tunnel4.ko \
     device/htc/click/custom/modules/2.6.29.6-Kalim/kernel/net/netfilter/xt_TCPMSS.ko:system/lib/modules/2.6.29.6-Kalim/kernel/net/netfilter/xt_TCPMSS.ko \
     device/htc/click/custom/modules/2.6.29.6-Kalim/modules.ccwmap:system/lib/modules/2.6.29.6-Kalim/modules.ccwmap \
     device/htc/click/custom/modules/2.6.29.6-Kalim/modules.seriomap:system/lib/modules/2.6.29.6-Kalim/modules.seriomap \
diff --git a/custom/kernel b/custom/kernel
index 68a8410..bea78ee 100644
Binary files a/custom/kernel and b/custom/kernel differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv4/tunnel4.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv4/tunnel4.ko
deleted file mode 100644
index c6f180d..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv4/tunnel4.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ah6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ah6.ko
deleted file mode 100644
index cf89d35..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ah6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/esp6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/esp6.ko
deleted file mode 100644
index 18ef062..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/esp6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ip6_tunnel.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ip6_tunnel.ko
deleted file mode 100644
index b7ac90b..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ip6_tunnel.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipcomp6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipcomp6.ko
deleted file mode 100644
index 9277ccf..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipcomp6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipv6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipv6.ko
deleted file mode 100644
index 8747c78..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/ipv6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/mip6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/mip6.ko
deleted file mode 100644
index f1a8c47..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/mip6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/sit.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/sit.ko
deleted file mode 100644
index 09f1261..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/sit.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/tunnel6.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/tunnel6.ko
deleted file mode 100644
index 55dc0ae..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/tunnel6.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko
deleted file mode 100644
index 8d0060d..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko
deleted file mode 100644
index 2231849..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko
deleted file mode 100644
index dbf91a1..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko
deleted file mode 100644
index 90b6b77..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko
deleted file mode 100644
index 5b15806..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko b/custom/modules/2.6.29.6-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko
deleted file mode 100644
index ef6e757..0000000
Binary files a/custom/modules/2.6.29.6-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko and /dev/null differ
diff --git a/custom/modules/2.6.29.6-Kalim/modules.alias b/custom/modules/2.6.29.6-Kalim/modules.alias
index eb4e033..35dccc1 100644
--- a/custom/modules/2.6.29.6-Kalim/modules.alias
+++ b/custom/modules/2.6.29.6-Kalim/modules.alias
@@ -2,15 +2,3 @@
 alias sdio:c07v*d* wlan
 alias ip6t_TCPMSS xt_TCPMSS
 alias ipt_TCPMSS xt_TCPMSS
-alias net-pf-10 ipv6
-alias xfrm-type-10-51 ah6
-alias xfrm-type-10-50 esp6
-alias xfrm-type-10-108 ipcomp6
-alias xfrm-type-10-41 xfrm6_tunnel
-alias xfrm-mode-10-0 xfrm6_mode_transport
-alias xfrm-mode-10-1 xfrm6_mode_tunnel
-alias xfrm-mode-10-2 xfrm6_mode_ro
-alias xfrm-mode-10-4 xfrm6_mode_beet
-alias xfrm-type-10-43 mip6
-alias xfrm-type-10-60 mip6
-alias sit0 sit
diff --git a/custom/modules/2.6.29.6-Kalim/modules.alias.bin b/custom/modules/2.6.29.6-Kalim/modules.alias.bin
index 1c95006..f4b4fde 100644
Binary files a/custom/modules/2.6.29.6-Kalim/modules.alias.bin and b/custom/modules/2.6.29.6-Kalim/modules.alias.bin differ
diff --git a/custom/modules/2.6.29.6-Kalim/modules.dep b/custom/modules/2.6.29.6-Kalim/modules.dep
index 966c210..4ed758f 100644
--- a/custom/modules/2.6.29.6-Kalim/modules.dep
+++ b/custom/modules/2.6.29.6-Kalim/modules.dep
@@ -7,18 +7,3 @@ kernel/drivers/net/wireless/tiwlan1251/wlan.ko:
 kernel/drivers/hid/hid-dummy.ko:
 kernel/drivers/staging/ramzswap/ramzswap.ko:
 kernel/net/netfilter/xt_TCPMSS.ko:
-kernel/net/ipv4/tunnel4.ko:
-kernel/net/xfrm/xfrm_ipcomp.ko:
-kernel/net/ipv6/ipv6.ko:
-kernel/net/ipv6/ah6.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/esp6.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/ipcomp6.ko: kernel/net/xfrm/xfrm_ipcomp.ko kernel/net/ipv6/xfrm6_tunnel.ko kernel/net/ipv6/tunnel6.ko kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/xfrm6_tunnel.ko: kernel/net/ipv6/tunnel6.ko kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/tunnel6.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/xfrm6_mode_transport.ko:
-kernel/net/ipv6/xfrm6_mode_tunnel.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/xfrm6_mode_ro.ko:
-kernel/net/ipv6/xfrm6_mode_beet.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/mip6.ko: kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/sit.ko: kernel/net/ipv4/tunnel4.ko kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/ip6_tunnel.ko: kernel/net/ipv6/tunnel6.ko kernel/net/ipv6/ipv6.ko
diff --git a/custom/modules/2.6.29.6-Kalim/modules.dep.bin b/custom/modules/2.6.29.6-Kalim/modules.dep.bin
index 0586f77..776a123 100644
Binary files a/custom/modules/2.6.29.6-Kalim/modules.dep.bin and b/custom/modules/2.6.29.6-Kalim/modules.dep.bin differ
diff --git a/custom/modules/2.6.29.6-Kalim/modules.order b/custom/modules/2.6.29.6-Kalim/modules.order
index d3fbae1..d895871 100644
--- a/custom/modules/2.6.29.6-Kalim/modules.order
+++ b/custom/modules/2.6.29.6-Kalim/modules.order
@@ -7,18 +7,3 @@ kernel/drivers/net/wireless/tiwlan1251/wlan.ko
 kernel/drivers/hid/hid-dummy.ko
 kernel/drivers/staging/ramzswap/ramzswap.ko
 kernel/net/netfilter/xt_TCPMSS.ko
-kernel/net/ipv4/tunnel4.ko
-kernel/net/xfrm/xfrm_ipcomp.ko
-kernel/net/ipv6/ipv6.ko
-kernel/net/ipv6/ah6.ko
-kernel/net/ipv6/esp6.ko
-kernel/net/ipv6/ipcomp6.ko
-kernel/net/ipv6/xfrm6_tunnel.ko
-kernel/net/ipv6/tunnel6.ko
-kernel/net/ipv6/xfrm6_mode_transport.ko
-kernel/net/ipv6/xfrm6_mode_tunnel.ko
-kernel/net/ipv6/xfrm6_mode_ro.ko
-kernel/net/ipv6/xfrm6_mode_beet.ko
-kernel/net/ipv6/mip6.ko
-kernel/net/ipv6/sit.ko
-kernel/net/ipv6/ip6_tunnel.ko
diff --git a/custom/modules/2.6.29.6-Kalim/modules.symbols b/custom/modules/2.6.29.6-Kalim/modules.symbols
index 5910a3f..af5dfd3 100644
--- a/custom/modules/2.6.29.6-Kalim/modules.symbols
+++ b/custom/modules/2.6.29.6-Kalim/modules.symbols
@@ -1,110 +1,41 @@
 # Aliases for symbols, used by symbol_request().
 alias symbol:jbd2_journal_try_to_free_buffers jbd2
 alias symbol:jbd2_journal_start_commit jbd2
-alias symbol:ip6_local_out ipv6
 alias symbol:jbd2_journal_load jbd2
 alias symbol:jbd2_journal_flush jbd2
-alias symbol:ipv6_getsockopt ipv6
-alias symbol:xfrm6_tunnel_alloc_spi xfrm6_tunnel
-alias symbol:ip6_route_me_harder ipv6
-alias symbol:ip6_frag_match ipv6
-alias symbol:inet6_add_protocol ipv6
-alias symbol:inet6_csk_search_req ipv6
-alias symbol:ndisc_build_skb ipv6
-alias symbol:ip6_dst_blackhole ipv6
-alias symbol:in6_dev_finish_destroy ipv6
 alias symbol:jbd2_journal_init_dev jbd2
 alias symbol:jbd2_journal_update_format jbd2
-alias symbol:inet6_del_protocol ipv6
 alias symbol:jbd2_journal_blocks_per_page jbd2
-alias symbol:ndisc_send_skb ipv6
-alias symbol:xfrm6_tunnel_register tunnel6
-alias symbol:xfrm4_tunnel_register tunnel4
 alias symbol:jbd2_journal_restart jbd2
 alias symbol:jbd2_journal_destroy jbd2
-alias symbol:ipcomp_init_state xfrm_ipcomp
-alias symbol:inet6_hash_frag ipv6
 alias symbol:jbd2_journal_get_undo_access jbd2
-alias symbol:icmpv6msg_statistics ipv6
-alias symbol:xfrm6_rcv ipv6
-alias symbol:xfrm6_tunnel_spi_lookup xfrm6_tunnel
 alias symbol:jbd2_journal_init_jbd_inode jbd2
-alias symbol:nf_ip6_checksum ipv6
-alias symbol:__ipv6_isatap_ifid ipv6
 alias symbol:jbd2_journal_abort jbd2
-alias symbol:ipv6_chk_prefix ipv6
-alias symbol:ip6_xmit ipv6
 alias symbol:jbd2_journal_unlock_updates jbd2
-alias symbol:xfrm6_tunnel_deregister tunnel6
-alias symbol:xfrm4_tunnel_deregister tunnel4
 alias symbol:jbd2_journal_wipe jbd2
-alias symbol:ipv6_dev_get_saddr ipv6
-alias symbol:ip6_sk_dst_lookup ipv6
-alias symbol:xfrm6_prepare_output ipv6
-alias symbol:icmpv6_send ipv6
-alias symbol:ip6_frag_init ipv6
-alias symbol:net_ipv6_ctl_path ipv6
-alias symbol:ipv6_dup_options ipv6
 alias symbol:jbd2_journal_set_features jbd2
-alias symbol:xfrm6_rcv_spi ipv6
 alias symbol:jbd2_journal_lock_updates jbd2
-alias symbol:tcp6_gro_receive ipv6
-alias symbol:xfrm6_tunnel_free_spi xfrm6_tunnel
-alias symbol:xfrm6_find_1stfragopt ipv6
 alias symbol:jbd2_journal_clear_features jbd2
-alias symbol:inet6_csk_bind_conflict ipv6
-alias symbol:ip6_route_output ipv6
-alias symbol:ipv6_push_nfrag_opts ipv6
-alias symbol:ipcomp_destroy xfrm_ipcomp
 alias symbol:jbd2_journal_get_create_access jbd2
 alias symbol:jbd2_journal_init_inode jbd2
-alias symbol:rawv6_mh_filter_register ipv6
-alias symbol:rawv6_mh_filter_unregister ipv6
 alias symbol:jbd2_journal_release_buffer jbd2
-alias symbol:ipv6_setsockopt ipv6
-alias symbol:inet6_csk_reqsk_queue_hash_add ipv6
-alias symbol:register_inet6addr_notifier ipv6
 alias symbol:jbd2_journal_forget jbd2
 alias symbol:jbd2_journal_start jbd2
 alias symbol:jbd2_journal_force_commit_nested jbd2
 alias symbol:jbd2_journal_check_used_features jbd2
-alias symbol:icmpv6_err_convert ipv6
-alias symbol:ipcomp_input xfrm_ipcomp
-alias symbol:inet6_sk_rebuild_header ipv6
-alias symbol:icmpv6_statistics ipv6
-alias symbol:fl6_sock_lookup ipv6
 alias symbol:jbd2_journal_set_triggers jbd2
-alias symbol:xfrm6_input_addr ipv6
-alias symbol:ndisc_mc_map ipv6
-alias symbol:inet6_csk_addr2sockaddr ipv6
-alias symbol:inet6_release ipv6
-alias symbol:tcp6_gro_complete ipv6
-alias symbol:rt6_lookup ipv6
 alias symbol:jbd2_journal_check_available_features jbd2
 alias symbol:jbd2_journal_stop jbd2
 alias symbol:jbd2_journal_extend jbd2
 alias symbol:jbd2_journal_ack_err jbd2
 alias symbol:jbd2_journal_begin_ordered_truncate jbd2
 alias symbol:jbd2_journal_file_inode jbd2
-alias symbol:ipv6_opt_accepted ipv6
 alias symbol:jbd2_journal_errno jbd2
-alias symbol:inet6_csk_xmit ipv6
-alias symbol:inet6_register_protosw ipv6
-alias symbol:ip6_dst_lookup ipv6
 alias symbol:jbd2_log_wait_commit jbd2
-alias symbol:inet6_getname ipv6
 alias symbol:jbd2_journal_clear_err jbd2
 alias symbol:jbd2_journal_release_jbd_inode jbd2
-alias symbol:ipcomp_output xfrm_ipcomp
 alias symbol:jbd2_journal_revoke jbd2
-alias symbol:inet6_destroy_sock ipv6
 alias symbol:jbd2_journal_get_write_access jbd2
 alias symbol:jbd2_journal_invalidatepage jbd2
-alias symbol:inet6_unregister_protosw ipv6
-alias symbol:inet6_ioctl ipv6
-alias symbol:inet6_bind ipv6
 alias symbol:jbd2_journal_dirty_metadata jbd2
 alias symbol:jbd2_journal_force_commit jbd2
-alias symbol:unregister_inet6addr_notifier ipv6
-alias symbol:ipv6_chk_addr ipv6
-alias symbol:ipv6_find_tlv ipv6
diff --git a/custom/modules/2.6.29.6-Kalim/modules.symbols.bin b/custom/modules/2.6.29.6-Kalim/modules.symbols.bin
index a4cde25..c60e73f 100644
Binary files a/custom/modules/2.6.29.6-Kalim/modules.symbols.bin and b/custom/modules/2.6.29.6-Kalim/modules.symbols.bin differ
diff --git a/custom/modules/wlan.ko b/custom/modules/wlan.ko
index 326478a..b48af9c 100644
Binary files a/custom/modules/wlan.ko and b/custom/modules/wlan.ko differ
diff --git a/libcamera/QualcommCameraHardware.h b/libcamera/QualcommCameraHardware.h
index d1ca60a..e71f709 100644
--- a/libcamera/QualcommCameraHardware.h
+++ b/libcamera/QualcommCameraHardware.h
@@ -30,7 +30,7 @@ extern "C" {
 
 #define version "7002"
 
-#define MSM_CAMERA_CONTROL "/dev/msm_camera/msm_camera0"
+#define MSM_CAMERA_CONTROL "/dev/msm_camera/control0"
 #define JPEG_EVENT_DONE 0 /* guess */
 
 #define CAM_CTRL_SUCCESS 1