CR changes: clean up