further cleanup; reverting unwanted file changes for merge