Remove the not ready and add cleanup for Tidy