some cleanup pre CR