remove some suppresswarnings, some cleanup

+review REVIEW-5192