Throwing extra deck chairs overboard

Change-Id: I810fe3e1e24ac4e32a3e26ee43802b81472f3c0a