Looks like we're getting there with the cleanup!