Moved some cleanup to the crawler