cleanup some references to wimp