diff --git a/device.mk b/device.mk
index dff6ff1..0ab770e 100644
--- a/device.mk
+++ b/device.mk
@@ -56,8 +56,7 @@
 
 PRODUCT_PACKAGES += \
 	audio.primary.panda \
-	audio.a2dp.default \
-	libaudioutils
+	audio.a2dp.default
 
 
 PRODUCT_PACKAGES += \
diff --git a/egl.cfg b/egl.cfg
index 92d91f6..edf6a25 100644
--- a/egl.cfg
+++ b/egl.cfg
@@ -1,2 +1 @@
-0 0 android
-0 1 POWERVR_SGX540_120
\ No newline at end of file
+0 0 POWERVR_SGX540_120
diff --git a/init.omap4pandaboard.usb.rc b/init.omap4pandaboard.usb.rc
index 6ea54b0..e942d9e 100644
--- a/init.omap4pandaboard.usb.rc
+++ b/init.omap4pandaboard.usb.rc
@@ -1,18 +1,18 @@
 on boot
-    write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
-    write /sys/class/android_usb/android0/iProduct $ro.product.model
-    write /sys/class/android_usb/android0/iSerial $ro.serialno
+    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
+    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
 
 on property:sys.usb.config=none
     stop adbd
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/bDeviceClass 0
-    setprop sys.usb.state $sys.usb.config
+    setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=adb
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/idVendor 0451
     write /sys/class/android_usb/android0/idProduct D101
-    write /sys/class/android_usb/android0/functions $sys.usb.config
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
     write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state $sys.usb.config
+    setprop sys.usb.state ${sys.usb.config}