cleanup to get rid of warnings