Restart of project with clean-ups, largely due to a new name