cleanup and reversions to gentooboontoo code that do now break unit tests