diff --git a/defaults/main.yml b/defaults/main.yml
index b55f152..1152dab 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,2 @@
 ---
 # defaults file for apigee-opdk-setup-os-ds
-apigee_net_ipv4_tcp_fin_timeout: 15
-apigee_max_map_count: 131072
diff --git a/files/apigee.limits.conf b/files/apigee.limits.conf
index 0a2b4c5..13583c4 100644
--- a/files/apigee.limits.conf
+++ b/files/apigee.limits.conf
@@ -2,8 +2,3 @@
 * - nofile 100000
 * - nproc 32768
 * - as unlimited
-
-root - memlock unlimited
-root - nofile 100000
-root - nproc 32768
-root - as unlimited
diff --git a/tasks/main.yml b/tasks/main.yml
index 0e71844..75b64ce 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,24 +1,10 @@
 ---
-# tasks file for apigee-opdk-setup-os-ds
-- block:
-  - name: Update ipv4 tcp timeout
-    sysctl:
-      name: net.ipv4.tcp_fin_timeout
-      value: '{{ apigee_net_ipv4_tcp_fin_timeout }}'
-      state: present
-
-  - name: Update vm max map count
-    sysctl:
-      name: vm.max_map_count
-      value: '{{ apigee_max_map_count }}'
-      state: present
-
-  - name: Update limits.conf
-    copy:
-      src: apigee.limits.conf
-      dest: /etc/security/limits.d/apigee.limits.conf
-      owner: root
-      group: root
-      mode: 0644
-
+# tasks file for apigee-opdk-setup-os-limits
+- name: Update limits.conf
   become: yes
+  copy:
+    src: apigee.limits.conf
+    dest: /etc/security/limits.d/apigee.limits.conf
+    owner: root
+    group: root
+    mode: 0644