Fixed issue on limit cleanup to handle undefined keys result