clean up unneeded thermal defs