diff --git a/api/device/current.txt b/api/device/current.txt
index e1ae855..144c48d 100644
--- a/api/device/current.txt
+++ b/api/device/current.txt
@@ -1,17 +1,14 @@
 // Signature format: 4.0
-
 package pawletos.device {
-  @SystemApi
+
   public class PawletDevice {
-    method public static String getBrandName(android.content.Context);
-    method public static String getCodename(android.content.Context);
-    method public static String getCurrentLocale(android.content.Context);
-    method public static String getManufactureDate();
-    method public static double getPawletSDKVersion();
-    method public static String getSeries();
-    method public static String getWarrantyExclusion();
-    method public static boolean isEmulator();
-    method public static boolean isPawletOS();
-    method public static boolean isRooted();
+    ctor public PawletDevice();
+    method public static String! getBrandName(android.content.Context!);
+    method public static String! getCodename(android.content.Context!);
+    method public static String! getManufactureDate();
+    method public static String! getSeries();
+    method public static String! getWarrantyExclusion();
   }
-}
\ No newline at end of file
+
+}
+
diff --git a/api/device/removed.txt b/api/device/removed.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/api/device/removed.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/api/device/system-current.txt b/api/device/system-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/device/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/device/system-removed.txt b/api/device/system-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/device/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/device/test-current.txt b/api/device/test-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/device/test-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/device/test-removed.txt b/api/device/test-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/device/test-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system/current.txt b/api/system/current.txt
index 254e879..7aa7c24 100644
--- a/api/system/current.txt
+++ b/api/system/current.txt
@@ -2,11 +2,13 @@
 package pawletos.device.system {
 
   public class PawletSystem {
-    method public static boolean isEmulator();
-    method public static boolean isRooted();
-    method public static String getCurrentLocale(android.content.Context);
-    method public static boolean isPawletOS();
+    ctor public PawletSystem();
+    method public static String! getCurrentLocale(android.content.Context!);
     method public static double getPawletSDKVersion();
+    method public static boolean isEmulator();
+    method public static boolean isPawletOS();
+    method public static boolean isRooted();
   }
 
-}
\ No newline at end of file
+}
+
diff --git a/api/system/removed.txt b/api/system/removed.txt
new file mode 100644
index 0000000..e6f50d0
--- /dev/null
+++ b/api/system/removed.txt
@@ -0,0 +1 @@
+// Signature format: 4.0
diff --git a/api/system/system-current.txt b/api/system/system-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/system/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system/system-removed.txt b/api/system/system-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/system/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system/test-current.txt b/api/system/test-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/system/test-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system/test-removed.txt b/api/system/test-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/system/test-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0