some cleanup pre CR
some cleanup pre CR