clean up sdcard services and such

Change-Id: Ie5852ec28476b85b5035735f334fd4e826aa9eab