remove unused bools

Change-Id: If3b00f96e47054aa124ad6cb51df622b5a01a5a7