Also add cleanup to method names just in case