code cleanup; changes due to repo move