[CLEANUP] - several

@pamval please review.