cleanup to work with window services