removed some stuff that was taking forever to sync from cm

Change-Id: Ib7fbc81df4cbeed811d8f38119ae6f0eb34fb0e4