remove bloat

Change-Id: I47f1e975b09c42f82c1a500b64a028d5e6c60ee6