Remove some of the bloat

Change-Id: I61631fddbb65e33a78119a58c052082b37ba584d