Clean project for complete re-write