Wilderness building for testing

and some cleaning in old files