diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
index 639ceb5..3f90ddb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt
@@ -129,8 +129,6 @@ class MyKeyboard {
 
         var mKeys = ArrayList<Key>()
 
-        /** The keyboard mode for this row  */
-        var mode = 0
         var parent: MyKeyboard
 
         constructor(parent: MyKeyboard) {
@@ -157,12 +155,9 @@ class MyKeyboard {
      * @attr ref android.R.styleable#Keyboard_Key_keyIcon
      * @attr ref android.R.styleable#Keyboard_Key_keyLabel
      * @attr ref android.R.styleable#Keyboard_Key_iconPreview
-     * @attr ref android.R.styleable#Keyboard_Key_isSticky
      * @attr ref android.R.styleable#Keyboard_Key_isRepeatable
-     * @attr ref android.R.styleable#Keyboard_Key_isModifier
      * @attr ref android.R.styleable#Keyboard_Key_popupKeyboard
      * @attr ref android.R.styleable#Keyboard_Key_popupCharacters
-     * @attr ref android.R.styleable#Keyboard_Key_keyOutputText
      * @attr ref android.R.styleable#Keyboard_Key_keyEdgeFlags
      */
     class Key(parent: Row) {
@@ -190,9 +185,6 @@ class MyKeyboard {
         /** The horizontal gap before this key  */
         var gap: Int
 
-        /** Whether this key is sticky, i.e., a toggle key  */
-        var sticky = false
-
         /** X coordinate of the key in the keyboard layout  */
         var x = 0
 
@@ -205,9 +197,6 @@ class MyKeyboard {
         /** Focused state, used after long pressing a key and swiping to alternative keys */
         var focused = false
 
-        /** Text to output when pressed. This can be multiple characters, like ".com"  */
-        var text: CharSequence? = null
-
         /** Popup characters  */
         var popupCharacters: CharSequence? = null
 
@@ -218,9 +207,6 @@ class MyKeyboard {
          */
         var edgeFlags = 0
 
-        /** Whether this is a modifier key, such as Shift or Alt  */
-        var modifier = false
-
         /** The keyboard that this key belongs to  */
         private val keyboard: MyKeyboard = parent.parent
 
@@ -264,14 +250,11 @@ class MyKeyboard {
             popupCharacters = a.getText(R.styleable.MyKeyboard_Key_popupCharacters)
             popupResId = a.getResourceId(R.styleable.MyKeyboard_Key_popupKeyboard, 0)
             repeatable = a.getBoolean(R.styleable.MyKeyboard_Key_isRepeatable, false)
-            modifier = a.getBoolean(R.styleable.MyKeyboard_Key_isModifier, false)
-            sticky = a.getBoolean(R.styleable.MyKeyboard_Key_isSticky, false)
             edgeFlags = a.getInt(R.styleable.MyKeyboard_Key_keyEdgeFlags, 0)
             icon = a.getDrawable(R.styleable.MyKeyboard_Key_keyIcon)
             icon?.setBounds(0, 0, icon!!.intrinsicWidth, icon!!.intrinsicHeight)
 
             label = a.getText(R.styleable.MyKeyboard_Key_keyLabel) ?: ""
-            text = a.getText(R.styleable.MyKeyboard_Key_keyOutputText)
             topSmallNumber = a.getString(R.styleable.MyKeyboard_Key_topSmallNumber) ?: ""
 
             if (label.isNotEmpty() && codes.firstOrNull() != KEYCODE_MODE_CHANGE && codes.firstOrNull() != KEYCODE_SHIFT) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
index aba6372..24c6988 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
@@ -323,7 +323,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
     }
 
     public override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        // Round up a little
         if (mKeyboard == null) {
             setMeasuredDimension(0, 0)
         } else {
@@ -564,22 +563,20 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
     private fun detectAndSendKey(index: Int, x: Int, y: Int, eventTime: Long) {
         if (index != NOT_A_KEY && index < mKeys.size) {
             val key = mKeys[index]
-            if (key.text == null) {
-                var code = key.codes[0]
-                val codes = IntArray(MAX_NEARBY_KEYS)
-                Arrays.fill(codes, NOT_A_KEY)
-                getKeyIndices(x, y, codes)
-                // Multi-tap
-                if (mInMultiTap) {
-                    if (mTapCount != -1) {
-                        onKeyboardActionListener!!.onKey(MyKeyboard.KEYCODE_DELETE, KEY_DELETE)
-                    } else {
-                        mTapCount = 0
-                    }
-                    code = key.codes[mTapCount]
+            var code = key.codes[0]
+            val codes = IntArray(MAX_NEARBY_KEYS)
+            Arrays.fill(codes, NOT_A_KEY)
+            getKeyIndices(x, y, codes)
+            // Multi-tap
+            if (mInMultiTap) {
+                if (mTapCount != -1) {
+                    onKeyboardActionListener!!.onKey(MyKeyboard.KEYCODE_DELETE, KEY_DELETE)
+                } else {
+                    mTapCount = 0
                 }
-                onKeyboardActionListener!!.onKey(code, codes)
+                code = key.codes[mTapCount]
             }
+            onKeyboardActionListener!!.onKey(code, codes)
             mLastSentIndex = index
             mLastTapTime = eventTime
         }
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index e5c6bb1..84818a5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,16 +27,10 @@
             <!-- Key is anchored to the right of the keyboard. -->
             <flag name="right" value="2" />
         </attr>
-        <!-- Whether this is a modifier key such as Alt or Shift. -->
-        <attr name="isModifier" format="boolean" />
-        <!-- Whether this is a toggle key. -->
-        <attr name="isSticky" format="boolean" />
         <!-- Whether long-pressing on this key will make it repeat. -->
         <attr name="isRepeatable" format="boolean" />
         <!-- The icon to show in the popup preview. -->
         <attr name="iconPreview" format="reference" />
-        <!-- The string of characters to output when this key is pressed. -->
-        <attr name="keyOutputText" format="string" />
         <!-- The label to display on the key. -->
         <attr name="keyLabel" format="string" />
         <!-- The icon to display on the key instead of the label. -->