remove unnecessary CMHW stuff