minor cleanup for milestone deployment