clean up for rewriting the whole project