remove some honeycomb legacy stuff