Cleaned up and ready to pull it out completely