Remove clutter

Change-Id: I8a9cdf3187c8e532d84665e2cd8a80dcd2886238