-redone project cleanup